meson: figure out wayland-protocols pkgdatadir via pkg-config
authorTim-Philipp Müller <tim@centricular.com>
Tue, 20 Sep 2016 15:46:30 +0000 (16:46 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Wed, 3 May 2017 14:10:51 +0000 (15:10 +0100)
Instead of hardcoding the location.

gdk/wayland/meson.build

index 85cac8bb042c4e6819bf36f81767fad89ce0061f..6783ecf19351643ecc90c82c55c6d2a09234be40 100644 (file)
@@ -1,8 +1,13 @@
 
 
 if wayland_enabled
-  #TODO: This should come from pkg-config --variable=pkgdatadir wayland-protocols
-  wayland_protocols_datadir = '/home/baedert/Source/gnome-configure/share/wayland-protocols/'
+  runcmd = run_command('pkg-config', '--variable=pkgdatadir', 'wayland-protocols')
+  if runcmd.returncode() == 0
+    wayland_protocols_datadir = runcmd.stdout().strip() + '/'
+  else
+    error('Could not get wayland-protocols pkgdatadir via pkg-config.')
+  endif
+
   wayland_scanner = find_program('wayland-scanner')
   genprotocols = find_program('genprotocolfiles.py')